diff --git a/templates/article.html b/templates/article.html
index c1bea9b..8fb8bad 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,7 +1,9 @@
 {% extends "base.html" %}
+{% block title %}{{ SITENAME }} - {{ article.title }}{% endblock %}
 {% block content %}
-{% set custom_header = "Posted on " + article.locale_date %}
-{% include "header.html" %}
+<header>
+  <h3>Posted on {{ article.locale_date }}</h3>
+</header>
 <article>
   <h1 id="title">
     <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
@@ -12,17 +14,17 @@
   </div>
 
   <div id="article_meta">
-    Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a><br />
+    <p>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
     {% if article.tags %}
-    Tags:
-    {% for tag in article.tags %}
+    <p>Tags:
+      {% for tag in article.tags %}
       <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% if not loop.last %},{% endif %}
-    {% endfor %}
+      {% endfor %}
+    </p>
     {% endif %}
   </div>
 </article>
-
 <footer>
-  <a href="{{ SITEURL }}/" class="button_accent">&larr;Back to blog</a>
+  <a href="{{ SITEURL }}/" class="button_accent">&larr;Index</a>
 </footer>
 {% endblock %}